auto merge of #534 : alexcrichton/cargo/issue-525, r=brson
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 19:43:46 +0000 (19:43 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 19:43:46 +0000 (19:43 +0000)
Closes #525

r? @wycats


Trivial merge